Fix cmake module path

Forwarded: not yet
Last-Update: 2022-10-19 <YYYY-MM-DD, last update of the meta-information, optional>

to be able to install cmake module in mulipath. Also, do not bail out if an
opencascade component is not installed in the cmake module (it might be in a
different package)
Last-Update: 2022-10-19 <YYYY-MM-DD, last update of the meta-information, optional>
Gbp-Pq: Name 0010-fix-cmake-module.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d57fee251efe0e5141ba6f8eb19c6033b7514a19..68dcc2b49d9e3105c1666df2ee072d559bf68834 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1196,6 +1196,7 @@ if (BUILD_SAMPLES_QT)
   OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/Viewer3dSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
 endif()
 
+include(GNUInstallDirs)
 
 # patch installed DrawDefault file if BUILD_SHARED_LIBRARY_NAME_POSTFIX is changed
 if (NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")

diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in
index 5079ba63c1b8e1d47d4f9248b2f2790d56a4cbf7..dbecabaa876c1fec675e80e37397bad611dae933 100644 (file)
--- a/adm/templates/OpenCASCADEConfig.cmake.in
+++ b/adm/templates/OpenCASCADEConfig.cmake.in
@@ -36,11 +36,11 @@ if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_ANDROID_ARCH_ABI}$")
 endif()
 
 # Set OpenCASCADE paths to headers, binaries, libraries, resources, tests, samples, data
-set (OpenCASCADE_BINARY_DIR   "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@")
-set (OpenCASCADE_LIBRARY_DIR  "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_LIB@")
-set (OpenCASCADE_SCRIPT_DIR   "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_SCRIPT@")
-set (OpenCASCADE_INCLUDE_DIR  "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_INCLUDE@")
-set (OpenCASCADE_RESOURCE_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_RESOURCE@")
+set (OpenCASCADE_BINARY_DIR   "@CMAKE_INSTALL_FULL_BINDIR@")
+set (OpenCASCADE_LIBRARY_DIR  "@CMAKE_INSTALL_FULL_LIBDIR@")
+set (OpenCASCADE_SCRIPT_DIR   "@CMAKE_INSTALL_FULL_BINDIR@")
+set (OpenCASCADE_INCLUDE_DIR  "@CMAKE_INSTALL_FULL_INCLUDEDIR@/opencascade")
+set (OpenCASCADE_RESOURCE_DIR "@CMAKE_INSTALL_FULL_DATAROOTDIR@/opencascade/resources")
 
 # The C and C++ flags added by OpenCASCADE to the cmake-configured flags.
 set (OpenCASCADE_C_FLAGS      "@CMAKE_C_FLAGS@")
@@ -89,6 +89,6 @@ foreach(_comp ${OpenCASCADE_FIND_COMPONENTS})
       message (ERROR ": ${OpenCASCADE_NOTFOUND_MESSAGE}")
     endif()
   else()
-    include("${CMAKE_CURRENT_LIST_DIR}/OpenCASCADE${_comp}Targets.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/OpenCASCADE${_comp}Targets.cmake" OPTIONAL)
   endif()
 endforeach()